Tweaks to first use case, plus two additional common cases.