Some backend fixes to make code more legible.