Cleaning up #576 slightly; add another related fluent-style method