Removed the ParseTree-specific workaround due to the 'extend' issue in
the compiler.