Regularize relation keys in raco; redux

This is the same as #85, but merged with master and with a couple of additional fixes.

Something went haywire in my git configuration, and I uploaded this as a new branch to be conservative.