f1a3698f4c
Ensure ScopeImpl can cope properly with remove when a field and method share the name Reviewed-by: mcimadamore, jlahoda