Subtle improvements after code selfreview.