Here's a new version of the patch with the latest feedback addressed.
-- Nathan BossartAmazon Web Services: https://aws.amazon.com