merged
removed superfluous call from bad merge
fixed transform visitor
merged
fixed NDEBUG double-negative problem
fixed stupid syntax error