Clean up domain record definitions

A small bit of macro hacking can leave the domain definitions somewhat cleaner, I think. Since the resulting definitions are pretty simple, I've replaced the tests with the minimum to verify that the macro is working as expected.