A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere.