allowed expr in definitions and added const