Clean up some small things if you upgrade to latest Pandas module.

Main thing is that indexing has change. Also made things more explicit in general.