Fix some issues with multiple extends in same line
Fix some issues with old knockout definitions