Removed special ApplicationMatch and kept it to the CallableMatch, no reason for more complexity here.