See #590. Finishing off markers ticket.