Adapt non-function handling to suggestions

Based on @davidchambers comments - thanks