Improved C++ reference resolving, improved C++ macro resolution, added macro references, improved split and replace methods