fixed arguments to properly allow overrides

mass-generation means mess up once, mess up everywhere! current status
is only Reader fails… https://gist.github.com/arubdesu/8469915