More work.
Incorporate suggestions by Cosmin.