Make sample configuration more readable.

Fixes #4724