Fix #821614 -- need to update to the new file api.
Start converting to new FAPI capabilities.
Port gmap_macro_builder to D7.

== -> === changes.
Remove unused variable.