Another pass for the WP PHP files