Discussed with PulkoMandy and on the haiku-commits mailing list. Thanks to @jessicah for compile-testing and fixing 2 small issues I missed.