Additional tidying.
Bugfix.