Fix case when S has too many mandatory keywords

Also remove numeric types from kw unit subtype unit tests