Merge "Final (hopefully) API cleanup." into honeycomb