Made several things more readable/scheme-idiomatic.