Minor changes in assembly generator source