Check in some minor changes to the scoping