Here is a new patch set in which I've attempted to address all feedback.
-- Nathan BossartAmazon Web Services: https://aws.amazon.com