I thought these simple changes doesn't need bpo number(Am I right..?).

Please refer to the commit message for detail.