Here is an updated patch which includes Alan's changes. Any concerns with this?

Thanks,

Aaron