Cleaning up cruft from PR #329