Now with macros, using my local version of machinist.