Issue 362 - Half a million lines of Go later.. (17)