Small clean-up after gsoc merge.