unhashed environments for source references
Merge branch '21-misc-cleanup' into 25