More work on intermediate code