Revert "Various small tweaks from morfic"

This reverts commit 96089a71b3c8c2880c68fc9428d8b44022f39cc9.