Definitely, especially the non-static objects. Cap of 16 is very restrictive, though I don't know enough to say whether it's still necessary or not.