Step 2.5: Un-inline constructor / destructors