Improve logic API type hierarchy.