Specialize on Types and use if-else instead of Val-dispatches

Specialize on Types and use if-else instead of Val-dispatches #3354