Bugfixes for the bitwise ops refactorings.