Minor cleanup of environment variable debugging
Move dispositions closer to useful plugins