A couple more inlines, whitespace cleanup