No functional change (hopefully), just some cleanups en route to fixing fbconfig validation in !1648 (merged).