Dropped a few more clone statements, where we know it's safe.