s4-torture: removed more uses of typeof()