Pointless 'do'.
Consistency.
Various improvements.