Minor cleanup, moving away from using Types\Type to comments that invoke the IDE (phpstorm) to do the same.