Fix minor WPCS issues raised by WordPress-VIP standard