Fix completion issues caused by recent improvements.
Merge branch 'master' of https://github.com/qiemem/world-maker into gh-pages