[PATCH] More const pointers