Fix object-orientedness.