Fixed -- argument handling.