Changed the way the no arguments case is handled.