Keyword changes better handled.

#23