Resolve "Extra marks and custom excuses (potentially) counted multiple times"

Closes #142

See merge request !148