* changes: [NS A23.1] Minor cleanup [NS A23] Move a synchronized block in a central place [NS A22] Small refactoring [NS A21] More cleanup [NS A20] Cleanup