src/control: a bit of cleanup here and there