This removes a number of explicit checks in the states themselves.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>