Start changes for Astyle injection on Astyle branch.