convert the existing maps to the new formalism
cleanup in warning messages so that they can remain in production