Cleanup after 3b288 and PR #2275