Move some docblocks around to please the PHPDoc overlords