* Refactor nested if causing error C1061 on MSVC. * Revert back and remove else's. * Add flag to track found arguments.