Which approach is actually taken in the implementation?  I think the "all commented out" approach would be simpler to deal with, but regardless maybe the APE should specify a final decision on this?