Tidy up a few more uses of extensions

Noticed by hvr.