Expand options after setting variables