Changed other bitwise stuff to use constants