Minor changes as per benkraft's comments.

Haven't decided if I want ENUMs yet.