GitHub #37: Add [s~]/[r~] and support code.  No via grafix yet.