Simplify call to TapHold for new options style
Fix bugs in option handling code