Pulled tweaks from xproc20 branch