Remove ValueOrDefault calls from low-level functions (for performance reasons).