changes to <function>; declaration:sym<raw> => delcaration:sym<core>; other tweaks