Cleanups for Facebook

A small set of API changes, and some cleanups here and there.