Minor work on bug 1073732
Reviewed PR 270