Applying changes suggested by JDF.