Cleaned up subject parsing.