[z1975] More uses of wrappers introduced in [z1965]

Also fix a typo that caused problems with Stances

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>

(based on commit ae1538c)

(cleaned version of 0f9bba1)

(based on commit [s1564] - 363fc7b)