Properly handle multiple file mappings. Simplify code. Tag 0.2.2.