Oh right, the arg length check would be good too! Okay no problem, I will do a merge and fix blaze-layout shortly. Just need to finish some other things first. Thanks for bringing this issue to attention!