Get rid of the defined(sun) checks.
Merge branch '20131019-fasttrap-many-args' into markj-develop