Fix Jay's pet peeves

See commit messages.