withoutmacros patched
treeposition fixed
reify return type bugfix