Refactoring + SimpleExpressionField progress.