Thanks for your input. If you would like to go ahead and update the contribution, that would be great. Just be sure to clearly document any modifications to core files that can't be overridden.