Re-arranged some method calls.