This results in considerable simplification of the code in terms of readability and
understanding what the heck it is doing. These changes will pave the way for the first
test-bed for non-spatial coordinate systems.