VID-1499 Cut down on unnecessary ifs