Touch-ups to beautifier BaseSubject