I discovered the same issue when working on adding an expando for Clyp (#982). I came up with almost the exact same solution before even noticing this PR.