Added FQN-expansion to catch statements and func args + according test.