SI-7132 - don't discard Unit type in interpreter