First attempt at switching behaviours to be macro-generated rather than handrolled.
Minor tweaks to behaviour generation macro
Added more policy definitions, to ensure the macros are expanding properly.  Looking good\!