misc: small cleanup

Still more to come, we NEED to rebase the sources before L drops like
bass on our heads.