TAMAYA-19:  Streamlined API and impl.