refactor: address MSRV todos (#15586)