Tighten up spacing around multiple choice options (part of #166).