Safety commit.
Further refactoring.