Minor tweaks to Ryan's tweaks.