FIX: minor code reduction.