First crack at #1030 (force captions).