Comments in the patch have the details. This patch also moves the public variable section to sit after the public phony targets. Committed, r486.
LGTM