Comment 9 for bug 1510313

Bert - haven't thoroughly reviewed patch contents, but would probably suggest a squash of the two patches before applying, given their descriptions..

A quick skim suggests some coding style improvements may be possible, in particular the first patch. Perhaps one for the next code-sprint?

Peter