Re #431 More tweaking.