``Functorized'' the code in order to remove the first implementation of
s-expressions and use the new functorized one.