Changes addressing #787.