Extends `map` to be variadic
Improves error messages and fixes review feedback
Fixes evaluation order and tests
Fixes include order