Slightly faster analysis phase?