Fix "taking address of temporary" GCC 4.8 error (GH-3)
Fix "ambiguous else" warning by expanding no-option case (GH-3)