Cleanup the way we check if variant combo is valid. I was also auditing to make sure we are doing the right thing. It looks like we are.