Do things right.

I think?
Remove multiple declarations.
Write program in concrete syntax.
Rename constructors.