Add self-closing marker option.
Add public visibility accessor.