Straightening up sub-APIs