Syntax fixes to make things more python-esque.