rbOOmit change: Cleaned up a few things from the previous commit.