Switching lazy to use by-name

This allows checking equality sanely, I believe
Merge pull request #1 from hmrm/feature-sane-equalit

Switching lazy to use by-name