Constness and linkage improvements.