Make TAB+ debug combos work again. Based on bugfix by Andrew Munger.