Lots of command handler refactoring here. A lot of logic was combined and simplified, and plenty of fixes have resulted from this. Speaking of which, this fixes a blocker that makes the next commit possible...