Opportunities for Non-Routine Problem-Solving within a Teaching for Mastery Approach in Primary Mathematics