Fix noncopyable stuff

As recommended by code review.