Small tweaks, avoid parse errors from empty phrase analyzers.
Merge remote-tracking branch 'origin/master'