Minor updates after discussion with @my_abstraction.