This will presumably go away once we disable the "empty block" warning