scoping changes effected by coffee upgrade

@trobrock