[rumble] Clean things up a tiny bit