Cleaned up how functions declarations are returned from the parse function.