Merge RoboSharp changes (cleanups) back upstream.

Reminder issue, see robosharp#1 for details.