API, pt III: List Units

Fixed for machine mapping, too.