Added backward-compatible argument handling.