Well, I think I have made some progress reconciling the formatting differences between my own jboss-modules fork and master. Completely eliminating them, however, would probably entail considerable manual corrections. So if someone could have another look at my patch and tell me either what else I need to do to make it fit for being reviewed or hint at some possible improvements ...