Revert "Improve readability."

This reverts commit 1023cd0efc60d15f6ae8dbb299136d399e66a00e.

This commit apparently proved far too controversial and instead the entire
crud should be refactored to make it easier / do less.