Put back shifts so action is found at $1.
Merge branch 'master' into posix_create