Merge "More cleanup of Loader APIs."