Minor tweaks based on actually reading the thing.