Started changing some methods to use macros.

Thanks for suggesting em, slacky! (WarPie)
Brilliant tip, muuuuch appreaciated mate.