adds special support for bitwise and
fixes a couple of more regressions due to parser changes