Implement edits required to make original PR #430 and PR #422 complete.