Fix issues with shift operator, again.