Re #1179 Final touches.