Commit numerous small fixups to discrete dimensions such that they