Make "guarded" take precendence over "fillable" in case key is in both by accident. Fixes #1545.
Merge branch '4.0'