Whoops; I meant to remove them as part of b8e82db11b4834d43703586b039e736025e82b33. Arguably that should have been done in a separate branch, but it's 90% of the way there now, so I'll just patch it up.