Split markup choice off into its own plugin