Fixed const issue.  Still doesn't compile with clang.