Bug fix related to return statements in function declarations