Tweak toolchain option handling