Moving to using OfpBlockDoConstruct with annotations.