No problem, I'll just note thoughts as I see them, but as this is a rebase it'll probably still end up good to merge. (-: