Tweaks in an attempt to appease the dialyzer.