Return an unmodifiableMap directly from extractMulti instead of recreating one each time mapping() is called.
Return an unmodifiableMap directly from extractMulti instead of
recreating one each time mapping() is called.

Misc cleanups as well.

int08h/nearenough