Oh well, point still stands - tackle the two things separately
(they probably shouldn't be in a single package anyway).