Sentinel changes to make return types more consistent and naming clearer