Better handling of neocomplete closing.