Hi, I've attached the revised patch with all requested changes, updated to the latest trunk. It would be great if this could make it into the beta so these constants can be used in 4.3. Oliver