Minor cleanups etc. .. and use SWSYNC for -NOW- in case it has some Observers that trigger DB operations.