Remove 'system' field from Node
Combine common method declarations into macros