Tidy up the Diaspora controller mess (partial).