Completed outstanding TODO on threadsafe access to StartOption property