Some Internal Cleanup - This will need a Groovy Internal Expert to ensure there is no bugs in this.