Make EntityUtil.wouldSuffocate (slightly) more idiomatic
Revert some changes to config