Remove ifdef’s around marker implementation (see #9 comments)