Forked fixup of maklesoft/shape-shifter