Re-apply 'clean up style errors after removal of bookkeeping synchronous code', which was reverted by 010d3152c2