Beginnings of simpler and more robust namespace mapping.