Reduced the complexity of the modular editable value handler.