First round of filetype tweaks.