Minor reorganization of inputs.