WL-2653 Just tidy up some code.