Small tweaks following up on #19.