Squashed 'posh/posz/' changes from 83e1464..f2d3fcb

f2d3fcb Ooops missed unstaged fixes.

git-subtree-dir: posh/posz
git-subtree-split: f2d3fcbbe78ef6b740a6b69447803e42962595ae
Merge commit '91769255f2d6ed6ef956ec01fbe926042d3211ac'