Fix various style issues in the extension parsing refactor