Switching lazy to use by-name

This allows checking equality sanely, I believe