Refaster: fix expression matching in absence of additional syntactic context

[rickie]

@BeforeTemplate implementations of the form return someParam; are valid constructs. With these changes such templates behave as expected, such that someParam only matches expressions of the appropriate type, not references to the type itself.

[rickie]

Rebased and added a commit to be compatible with the latest changes.