Added macros to simplify implementation of Node trait methods.

Added macros to simplify implementation of Node trait methods.

Removed unused, commented code