Replace #everything-else by $self in the expression grammar
Add OTP templates