Merge PtReactor, resolve a few of my comments.

This branch merges @eta's !901 (merged) into main, then resolves a few of the issues that I noted in the review there.