r3083: fixed a couple of generic mapping errors found with RAW-* and cifs:mapgeneric