Remove some redundant/unnecessary workstates

As discussed under
https://groups.google.com/a/pyfarm.net/forum/#!msg/discuss/Qd7zAdSDTMc/NiacNdKwAbwJ