mpd: fix style issues and type errors introduced in 87ce309
Tests are now OK