Simplify definition checks to reduce time in task