Clean up a couple bits I missed.