Fix whiteboard parsing

This fixes the problem where whiteboard parsing was order-dependent. Now
it's not.

Fixes #53