@tarruda I agree with @lslah. Style PR makes sense before code changes. You may want to postpone the renaming of `mch_inchar` if it's going to touch a lot of files.