Added another refactoring.
Corrected some expression reduction.