A bit of cleanup after #10