Make Leonie project build again.

Slight code clean-up, too.