Minor API work.