RC2: speed-ups and CS changes

=== is faster than ==.