Changes to new type indication syntax.
Fixes minor inconvenience.
Fixes bug with double normalization.