These conditions are checked again in is_extra(). This patch makes no
functional changes.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>