Simplify/fix debugging options.