Tidying up a couple of class method calls.