I think in fact if you delete those declarations things should "just work"