Fix environment-content to return the right keys.