Allow for easier testing of the skip limit.
Remove an unused define.