Don't partially match logic words. Fixes gh-322
Allow variables as object values. Fixes gh-323