Clean up override tick logic. Closes #71.