move toward upstream atomic defs