Cleaned up message node parsing.