More short-hand, minor updates.