Merge cleanups and use of proper per-service capabilities from Augie.