Small fixes needed for focal support.

[wohe]

Signed-off-by: Wolfgang Hess [email protected]

[clalancette]

Seems reasonable to me.

[ojura]

Wait, you are allowed to return by value an lvalue unique_ptr without moving from it? I remember seeing somewhere that in general std::move on return is a bad thing because it prevents the compiler to do copy elision. But I thought it was necessary with non-copyable types like unique_ptr.

[wohe]

@ojura See https://en.cppreference.com/w/cpp/language/return or https://isocpp.org/blog/2013/02/no-really-moving-a-return-value-is-easy-stackoverflow: Removing the std::move here does not prevent moving.

[feuerste]

LGTM

[anchuanxu]

thanks!