Simplified the factor check even more.