Scoped_handle.
make_* functions do not take _opt_ params.  Fixing implementations to not pass potential null values.