Fixed bug in manual variable spill() and added a test-case for that.
Minor changes in annotations.