Added types to macro methods
Added types to macro methods

AlecZorab/spire,adampingel/spire,JackSullivan/spire,siddhartha-gadgil/spire,codeaudit/spire,non/spire,adampingel/spire,JackSullivan/spire,kevinmeredith/spire,tixxit/spire,woparry/spire,guersam/spire,kevinmeredith/spire,siddhartha-gadgil/spire,non/spire,rklaehn/spire,guersam/spire,tixxit/spire,codeaudit/spire,rklaehn/spire,AlecZorab/spire,woparry/spire