Make API more closely match the code and vice-versa.