Cleanup from the change to casting methods.