Tweaks after feedback from benilovj.