#1639: Polished examples