Clean up system table declarations

[kazimuth]

Currently there's a lot of redundancy in there, it would be better for a macro to generate all the relevant data at once.