Updates according to [Kouril, 2012].
Improved facilities for literals.