Thanks for the offline chat @elemoine. Comments addressed with e99075a and b1bc731.