Minor argument check and refactor.