hichaelmart: your patch gets an 'evil but consistent' vote from me