Remove special handling of 'self' key.

It's already picked up in our action templates.  No need for the
hardcoded removal.