Minor code cleanups in preparation for forking as a SyncIt bootstrap