fix some warnings
put things in the right place
Only bypass for ARC4. This should fix GCM weirdness.