Fix for bug #11429: Wrong behaviour for switches. Small improvement for code size...