Fixed weird compilation error that took a while to pop up, and removed bad RSI comments.
Fixed MORE build problems!  See #1405 for the cause...