Little tidy up.  Commit to using CLRS logic for r.