Adding back in keywords.

Yes, I'm your hero, @algernon

This patch supported by [this song](http://rd.io/x/QX3EPTdoxts/)