simplify finite variant computation code slightly
wibble