Shorty: Some internal code cleanups.