Replace homegrown getOptFromStr() with Option() /cc @bamos