Only surround 'package' names if they're not already surrounded
first crack at getting variables in scope / context
prefer do-while