removed recursive inlining, more aggressive inlining elsewhere. Added dimap for Moore