As long as we're improving code quality, could stop mutating the `options` hash here.