More fiddling around refining APIs