Cleaning up some more stuff. (Thanks Buck)