Better version of that last fix - handles near-sea-level activities, different number formats, avoid maintaining a counter when a bool is sufficient