Re #7737. Remove no-longer-used variables.