Finished draft of Groovy null handling