Refactor arg and variable handling for local variable annotations
Merge branch 'debug-vars'