Small changes to support the Z/OS extension.