Review feedback from @robrix.