Replying to nacin:
Cool. (Not a problem, also. I killed the attachment.)
Patch looks great, at a glance. All I see are coding standards improvements to be addressed. Marking for 3.2-early.
As this is my first contribution to the wordpress core, I'm a little unsure of standards. Sorry! Should I make those change and re-upload?