I did thing at the support for classfiles at some point. 1) would be nice, to simplify the code. 2) can be part of a different ticket if needed.