Minor improvements to the previous find_option() commit.