Intermediate commit of API tagging work.