Merge "Don't assume that we're at start of file at ctor time"