refactor: basic_consume/10 -> /9
cherry-picked from bug24297
merge default into bug24297
cosmetic
brevity
refactor: genericise
merge default into bug24297