#131 Performance tweak: use inline and override dimap