Improve abbreviated type regex, add abbreviated syntax parsing sanity check