Allow for proper cycle accounting now.

This also incidentally makes the code 10% faster