- While at it, modernize the use of options and fix a couple of whitespaces PR: 190476 Submitted by: Lawrence Chen <beastie@tardisi.com>