Minor cleanups, new definitions, and code movement, preparing for
upcoming new-EH and NCQ changes.  This commit shoult not change behavior
at all.
Signed-off-by: Jeff Garzik <jeff@garzik.org>