Is it safe to do this in all cases? I guess we could add a marker if we ever find a place where it shouldn't be handled this way.