and fixed possible local abort ignore due to previous commit. Some if/else/if to switch/case conversion.