Will defer this temporarily - there's a few bits of cruft like this accumulating, so I'll make a FIXME pass for things like this as my next branch.