Don't instantiate inputs as default args

Fix issues with alternative configurations, where the default doesn't make sense, but is always instantiated anyway.