1.5 blocks arguments

Fixes http://croogo.lighthouseapp.com/projects/32818/tickets/403