Compact based on feedback from Johannes Sixt.