Left some set -x/+x nonsense in the last commit.