Revert all annotation changes for environment variables and command line arguments. See commit f8189ddf.