Note the change to XS(), and the addition of XSPROTO(), as something