Re #443. More tabs and cleanup.