Merge branch '16-t-varop-mm' into 21-scalars
make R_EmptyEnv be a constant
Merge branch '21-scalars' into 22-remove-stuff