Some trivial cleanup

Anyone should be able to merge this in. @jnfoster might be interested in looking at it.