Modified Inputs

Internal performance improvements only; no changes to public interface.