Fixes #2283 and does some more polishing, such as better chances that the custom biopax/sif style and layout will be applied.