Fix handling circular inheritance for options