Small improvements. See TODO.