Fix handling of unit value () and thus printing