Renames and reformatting

Change-Id: I8b6d7aeb29dafd4065978430823418bd0b48d311
Generalise integers with units

Change-Id: Iae5582f0ba5b26304a5ce6e9a7c9e0ed238a4240
Add identifierish parse group

Change-Id: Ie3d296bc0a87cdd74e53e3ec8cc70eba7565a65d
Add long expression template and rules for arithmetic

Change-Id: Iced3428d28e16ba6fc53d5d482c966f1ac56b23b
Add new expression templates and improve base expression template

Change-Id: If69bd393e45dfbd3742d292829d4bf871e40fd69
Remove uneeded space in template override attribute

Change-Id: I0e660707c12daa13a3c271a31a0c796e841c2927
Add expressions

Change-Id: I6190c27e8d2e90dd9b3a071e208f58ed6f341727