This was shockingly easy to do. Everything seems fine, and there are no
memory leaks so I'm gonna say this is commit ready!