Improve lispy keywords support