Issue #6: Made appropriate all.equal changes.