[REQ] Improve inline substitution

[mhatzl]

The spec got new direct substitutions, and currently aliases are implemented similar to direct substitutions, which is going to become a problem in the future.

This was discussed in PR #97 , but it was decided to handle it separately.