Tweaks to allow types with no following primitive at EOF.