Another quick Environment revision.