headers: few more internal tweaks.
util: few updates.
core: introduce _normalizeFileData to be extended. DRY out few sanity checks.