Statistics: faster query for expressions
+ some coding conventions

Change-Id: I9ebe658d77abd47c5581eb7a5d2aae2637d89caf