This makes it easier to merge an upcoming patch, and overall makes the
code a bit more clean.
Signed-off-by: NJeff Garzik <jeff@garzik.org>