Addresses issue #1504. @tsandall @patrick-east @kenfdev Honestly, I'm slightly shocked at how easy this was. The bad news is that it's 100% magic, so I don't think there's much we c...