Pull request #468

Largely to completely eliminated use of `rfl` as a term.