Fix parser to handle apple.com changes

This is getting ugly and needs serious cleanups eventually...