Ok, @adamrp, your code so you choose to change or leave as-is. @wasade, going to assign this PR to you for final review/merge when it's ready, ok?