Fix for #215 and some other related improvements

I haven't added any literals, what are you talking about? :)