Some APIs were arranged, again.