Merge branch 'jk/tighten-alloc' into maint