Agree, this new implementation needs more work.  I'll push a follow up commit soon.