Currently the unitsuffix check fails, as it bases itself around frame children. This was mostly true before, but it should be less common due to 4.x.

There are also lots of room for refactoring of the function and clean-ups. I wouldn't be surprised if several other parts of it was tailored towards "the old ways".

d6c4310 should do the trick.