Ease some more restrictive rules

Allow mixed type hints in doc blocks to allow functions to accept more generic parameters.
Allow "Trait"/"Abstract" as part of class names.