Following advice from Michael Ansley, I broke up the patch in

two: one fixes uminus and other literal length. They are to be
applied - uminus first, then possilbly literal on top of uminus.

Leon