More uniform code.