Improved parsing, I hope.