litmus: extend typing support + new hashing for pre-si