Some tweaks to clean up a bit.