Added a couple additional single line REs that people had requested, and removed a little bit of extra code that accidentally stowed away in with the last check-in.