Resolved review comments from dfoster.