This allows a more flexible implementation for the functor-expression
parser and other conveniences.

This commit doesn't remove the old types but temporarily adds new ones
with a different name. This is to simplify the transition to the new
types.