Move more macro code to functions