Taking advantage of return_value when possible, adding Forms\ElementInterface [ci skip]