Sounds about right. Proper abstractions are difficult to get right up front, might as well pull them out only when they're obvious and profitable.