Refactor.
Interim commit.
Safe operator.