Some small tweaks for discussion

See commit summaries for details.