This moves the various checking into the helpers, to avoid the
callers missing the checking.