Made {set,modify}F return types explicit