Some more cleanup. Combined 'character' and 'sprite' objects.