Improve a few code comments and follow the convention of using
destructing for constructors that take a single `options` argument.