PR feedback (nits)
Write back resolved port to options.