Incorporate 3.2.0 PR bot review comments: * https://github.com/dvorka/hstr/pull/557
Incorporate 3.2.0 PR bot review comments: