Record obsolete instructions and renumber BRACKET
Don't need this any more
Fix indentation and stray variable
Use lambdas here and clean things up
This doesn't need to be virtual