Normalized CodeBlock return property

The CodeBlock's return property was only set for reference types but not for primitives. This is rather not very consistent and is confusing for people relying on the property to be set.