use more idiomatic first-pair syntax in BUILD