Less queued work

Merged Adam Jackson requested to merge ajax/xserver:less-queued-work into master

Fix a couple of places where we defer some work to the workqueue for no real reason.

Merge request reports