One step towards #19

Also created #32 for the problem shown here. Miniboxing is getting as complicated as specialization :((