Fix #1792 - Don't coerce attribute names to string when checking for mappings