"uninlined" template methods. Fixed constructor.