minor cleanups/fixes to Mapping...Factory inl stuff