Bug 4610 - Do not create duplicate declared statements