Minor simplifications and inlines