(everything else here looks good though; I'll happily mark with r+ once above is fixed.)