Fixed parsing for autoload functions and non .. functions.