Done by 3f2a43e. This will perhaps make @staticfloat's life easier.