Merge "Use MAX_ENTROPY_TOKENS and ENTROPY_NODES more consistently"