Specialize on Types and use if-else instead of Val-dispatches (#383)

Specialize on Types and use if-else instead of Val-dispatches (#383) #406