Tidying pre-WordPress 3.5 code