Clause marking tweaks