BZ-99999 Slight cleanup of ECMModel handling of inputs and hints.