improve code annotation for if- and switch-statements, minor code cleanups
improve code annotation for if- and switch-statements, minor code cleanups

dahebolangkuan/cython,fabianrost84/cython,mcanthony/cython,marscher/cython,encukou/cython,madjar/cython,scoder/cython,fperez/cython,achernet/cython,marscher/cython,acrispin/cython,roxyboy/cython,madjar/cython,roxyboy/cython,madjar/cython,acrispin/cython,scoder/cython,fperez/cython,slonik-az/cython,encukou/cython,mrGeen/cython,fperez/cython,marscher/cython,hickford/cython,achernet/cython,fabianrost84/cython,hickford/cython,fabianrost84/cython,scoder/cython,hickford/cython,hhsprings/cython,hhsprings/cython,c-blake/cython,andreasvc/cython,acrispin/cython,encukou/cython,hickford/cython,achernet/cython,roxyboy/cython,JelleZijlstra/cython,marscher/cython,JelleZijlstra/cython,andreasvc/cython,da-woods/cython,fabianrost84/cython,scoder/cython,acrispin/cython,slonik-az/cython,madjar/cython,c-blake/cython,cython/cython,da-woods/cython,mrGeen/cython,mcanthony/cython,hhsprings/cython,mcanthony/cython,roxyboy/cython,mcanthony/cython,ChristopherHogan/cython,encukou/cython,achernet/cython,fabianrost84/cython,andreasvc/cython,slonik-az/cython,mrGeen/cython,JelleZijlstra/cython,andreasvc/cython,da-woods/cython,dahebolangkuan/cython,fperez/cython,ChristopherHogan/cython,cython/cython,andreasvc/cython,encukou/cython,hickford/cython,achernet/cython,dahebolangkuan/cython,ChristopherHogan/cython,slonik-az/cython,slonik-az/cython,fperez/cython,c-blake/cython,mrGeen/cython,dahebolangkuan/cython,acrispin/cython,mcanthony/cython,marscher/cython,hhsprings/cython,c-blake/cython,madjar/cython,da-woods/cython,mrGeen/cython,JelleZijlstra/cython,dahebolangkuan/cython,JelleZijlstra/cython,c-blake/cython,roxyboy/cython,cython/cython,hhsprings/cython,cython/cython