Bug 1003095 - Clean up how we provide several APIs;r=past