Make return types const as intended