Lots of cleanup on rock types and rock methods.