Morphis/common rework

See commit summary for more details.