Split out a few more cmds

Doing this in chunks for bisectability.

Also, don't execute FF, which seems to help performance on GoW by ~3% or so for me.

-[Unknown]