Use correct options to finish of markup layout

Fixes #2152.