Re-revert. Removing simpleName makes it loose the information present in
the expression annotations.