Follow up to r99307, with some inline comment documentation on why these !important...