(minor typing simplifications)