_s: Update comment markup to make it forward compatible with html5
comments in 3.6. As a result the custom callback can be safely removed
in the future. Also closes #220.