Actually, Iota already had the rework you are demanding, months ago.

You should start reading at #76. It is a fast read.