Use expansion on function bodies
Discard old dispatch