I much prefer your second suggestion of hiding the variables in a scope or a context.