Perhaps I could factor it out into a category similar to what you've done with the NSDocument additions? A separate branch is just more maintenance burden...