I just upgraded to Yosemite Beta 4 (14A379b), reapplied the fixes, and everything is happy again!
open