Checked our previous GPDB hacking code and newest implementation.
I found that previous gpdb related diffs do not seem to apply to
current gpdb code. So removing the FIXME. This patch also slightly
refactors some code and changes some other existing comments.