Removed duplicate conditionals in Roll::new(...).