Address parse/resolve section refractoring. Once again.