Cleaned up function calls a bit to prepare for a massive overhaul of parseSIMPLE