Revert 58a02ba and implement a better scheme: We only let USED
fields through split(). This way unused fields can differ and
it won't be a problem. This enhances solutions to issues #654
and #655.