Make template a little more concise
Fix bug in calculation of Whip#no_loyal and Whip#no_rebels