Supersedes #368. Adds exceptions for unwrap_or_default due to preference against Default's ambiguity.