I've also committed the attached.  It gets around the SIM_AC_COMMON 
problem by inlining the macro's contents.

Your turn :-)
Andrew