Modified counting macro's..

I had some issues with const lists: therefore it is better to pass the element as well ( also: now it better aligns with the other macro's)