Fix IDE errors

Ahead of the master, but should be in sync when taylor merges the phpdoc
fixes.