Updates to match some changes from the patch branch

This updates the rlabel function and also some unrelated -Wall/hlint clean up.
Added comment about scale-by-zero errors