Ambiguous-type wibbles
Fix typo in extension flags
Typo in comments
Re-do commit 1b8b7f47018eb33bebb0d7f3ee451f7d858a0f8f, which got lost by mistake