In b23 I've given Alexander a colossal negative modifier for MINOR_CIV_APPROACH_CONQUEST. He was previously at 0, which I'd assumed meant he wouldn't do it but apparently was not the case. If these modifiers work as I now believe they do (after analyzing some AI files more), hopefully this will block him from wasting his trait by going to war with citystates.
I'm rather happy with how militaristic leaders now declare war on their neighbors early, often, and with large armies. The problem is they tend to then make peace 4 turns later!
I've made some additional changes which should hopefully alter this in b23. In particular... if they haven't suffered any damage in the war yet, they
should be less likely to ask for peace. Key word "should!"

A lot of this stuff is ambiguous so I'm making educated guesses, then just seeing what happens.