Further tweaked Unit.can_enter()