Better implementation for ternary shortcut

Hello internals,

attached is a much better implementation for the ternary shortcut.
If noone sees a problem with it, I will be comitting this on thursday.

best regards
marcus