[optimize] move the remaining if-code intro methods