More enum-fixing with code blocks.