Simplify a bit (in response to jgraham review).