too many empty lines? (nb. i'm about to rebase your suggestion onto my branch)