Small optimisations and a few new MIME types.