Little cleanup here, but I'll just nuke it in the merge if you don't get to it first.