Less shared_ptr copying in NormalExpander