Minor refactorings.

[ci:skip]