Optimize and cleanup RSP further.

  * Continue to optimize and cleanup RSP prior to v0.2.