s3: Disentangle resolve_name() a bit