Combine Is* and Is*Until Methods

I realized I could combine the Is* and Is*Until methods.