Improved custom builder lookup (solves #6)

This implementation uses auxilary macro.