Improve formatting in Components.cpp template file a bit.