Cleanup per #3641 comments