Updated to match xsubpp-1.929.