STY: remove extra line (thanks @wasade)
ENH: 15% more speed (thanks @wasade).
MAINT: tidy up declarations, including right types for indices.