Added derdon's changes.

1. Removed 'starred' from frozenset.
2. Added check for typ.lower() for 'starred'.