switch goto statements for single if

also remove extraneous "Block::" from
inherited class initialiser lists.