Remove unnecessary condition and equate as_Add with True