allow token expressions to be resolved, besides value expressions
restore the previous functionality (fallback to wildcards in reification pipeline)
Document AddressMapping class