Minor tweaks for func context