fix style issues. (back-port).