naf: cleaning up player source handling