merkle: code cleanup.