Fix handling of < in values, broken by map merging

Fixes issue #24.