Address parse/resolve section refactoring. Once again:(