Workqueue cleanups

cc. @pcwalton