Merged changes from lazy-utils.