Minor clean-ups

This PR contains a few minor clean-ups to rbush. Please merge, cherry pick, or ignore as appropriate.