Added support for short-form ToSingleton mapping. Includes new errors and tests.