Enforced some types on the internals a bit.