A collection of bigger and smaller commits that all vaguely try to reduce the scope of things in eel.