Minor cleanup & a Python 3k fix.