[PATCH] More verify code move